Merge "Merge "Fix announcement of global actions menu" into oc-dr1-dev am: 5d378e5f2a" into oc-dr1-dev-plus-aosp
am: f627f51b4f

Change-Id: Ic0c577547f83080fc2dd9032cb373870d7cf2a0c