Merge "Revert "Revert "Enable manage mode for ExternalStorageProvider when...
Merge "Revert "Revert "Enable manage mode for ExternalStorageProvider when called from Files""" into rvc-dev am: a6613609 am: d9f80f13 am: 0d15fc96
Change-Id: I5113c833343f998b0766689de83747e090171cc1