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 am: 5e3686b4 am: 09964b6b
Change-Id: I75cbc6ee19b8aee0864b6ec08a921dbff021182a