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

* commit '30f37594e02e09903c56e1325cec85081f2aadb8':
  Keep read/write external storage as built-in permissions

Change-Id: If7a68c832d07d204bb18ae6ce5008433c8cce328