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

Change-Id: I6912a4d634152d40a9af1ab98f2303ec8288e55f