Merge "Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it" into nyc-dev
am: 88545ce446

* commit '88545ce4463939b90be1e5141b1dc3c1994fa35d':
  Make EXTRA_SHOW_MENU visible to Settings so StorageSettings can use it

Change-Id: I6738c82f8e390596b267782e5e8d872041b5c089