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 am: b78987c0
Change-Id: Ib1227d830d3932b23f15ce774690b39a49b3a66f