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