Merge "Enable manage mode for ExternalStorageProvider when called from Files" into rvc-dev am: aef23c0e55 am: 3de75b08b6

Change-Id: I6063557ed4d72569b51287df4b9b0ac7ace05c2d