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