Revert "Revert "Update ExternalStorageProvider.java""

This reverts commit e64eefba70734609675d47f75b35647cd9428152.