Don't show top toolbar items when bottom toolbar is enabled

The original CL for this (
was reverted because of a null pointer bug. This CL does the same thing
as the reverted CL and fixes the null pointer exception by having
ToolbarManager#getMenuButton() return the bottom toolbar menu button when
the bottom toolbar is enabled.

Bug: 852117

Change-Id: Ic2668a3cac6a552bee4476d1cfb58f8e6c290bfd
Reviewed-by: Matthew Jones <>
Reviewed-by: Ted Choc <>
Commit-Queue: Pedro Amaral <>
Cr-Commit-Position: refs/heads/master@{#575372}
5 files changed