Merge "Add TEST_MAPPING for ExternalStorageProviderTests" into main