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