Merge "Allow ExternalStorageProvider to access all Android/ dirs" into rvc-dev