Merge "Use a config flag instead of a RO flag for showing Manage Storage." into nyc-mr1-dev am: 3843dd96f5
am: 95ce1811ed

Change-Id: I22a87383234d2b909e4402093f587a4f60f52ed2