Merge "Keep read/write external storage as built-in permissions" into nyc-dev
am: 65136ac

* commit '65136ac6a4f6fb2423a0768b451782dcd0e960d5':
  Keep read/write external storage as built-in permissions

Change-Id: I2688ed6f57e92238afe729d636ad23c23af288cb