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: 02f1d4df
* commit '02f1d4df':
Change-Id: I9e452c28a27ee16203a1eaed82a8b8db1df6dfc8