Merge "Revert "Revert "Enable manage mode for ExternalStorageProvider when called from Files""" into rvc-dev am: a661360940

Change-Id: I09d3eeda2453825b22b99fd236b7696306c7d584