Merge "Add ResourcesLocaleTest#testDeprecatedISOLanguageCode test" into main