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 am: 2f856872
Change-Id: I79e13c1ba9ef8b57f7291e68005ce40733e90798