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: I57b0cd691dc1d8fb455c5016c5c507ce3434db9a