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: 6582d086
Change-Id: If6c3616125799dfa0965689776cc4b4e6f0b903c