Merge "Remove ExternalStorageProvider special case for having media_rw"