Merge "Set LEGACY_STORAGE only from READ_EXTERNAL_STORAGE" into qt-dev
am: 88d88df174

Change-Id: Icc69a2d84993c9b760240653079584ecbe07f01c