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: a8a4d0a5
Change-Id: Ieef26346936e8637ad5a521a6f907773800328b5