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
Change-Id: I4d2b8c5f7e59746780b176cd5fab0bc25d38894b