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

Change-Id: I7ac72c816fba5c30b2b533253dd165fc19d3d7ef