Merge "Revert "Enable manage mode for ExternalStorageProvider when called from...
Merge "Revert "Enable manage mode for ExternalStorageProvider when called from Files"" into rvc-dev am: fb4c0603 am: 1315f4c9
Change-Id: I65b87cd9ea69402037610e90809b6d24765629a9