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

Change-Id: I1deaa10b396c7c0a139c47697ff89b297cf7978d