Merge "Merge "Set LEGACY_STORAGE only from READ_EXTERNAL_STORAGE" into qt-dev am: 88d88df1 am: b0956e31" into qt-r1-dev-plus-aosp