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: 0d15fc96 am: 6f174e07
Change-Id: I95db7b70a990ee52056d647253d542cda00046bd