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