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

Change-Id: I9261bac58152757f7f4522daf7380d569e46f188