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