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: f2682f5b am: 8411e988 am: 657f64f7
Change-Id: Id3399967bbf523697e8f67a5dfccd3b4b1c028e8