Merge "Merge "Set LEGACY_STORAGE only from READ_EXTERNAL_STORAGE" into qt-dev...
Merge "Merge "Set LEGACY_STORAGE only from READ_EXTERNAL_STORAGE" into qt-dev am: 88d88df1 am: b0956e31" into qt-r1-dev-plus-aosp
am: edea63ad
Change-Id: If7ec8a2d2d27543024db5850694aca8c20e02021