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