Merge "Grant ExternalStorageProvider media_rw"