Merge "Revert "Enable manage mode for ExternalStorageProvider when called from Files"" into rvc-dev am: fb4c06038c

Change-Id: If605e76f8b878f4b7e88c47be84a4f2a9923c954