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: ee93842b am: 0486b475
Change-Id: I3cc223c51e441acf7bc2e1c5cd52ae48800594ea