Merge "Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can...
Merge "Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev am: 88545ce4 am: 7d47bd49" into nyc-mr1-dev-plus-aosp
am: c28cdc8d
* commit 'c28cdc8d':
Change-Id: I3370a54b9412667959dd5fb05f0c526887055875