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: 0486b475 am: 834a293c am: e5d4d6a7
Change-Id: I249319394616e60b917b365402b0c2df5326a4ab