Merge "Add ResourcesLocaleTest#testDeprecatedISOLanguageCode test" into main am: 704d2fffec

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2705153

Change-Id: I8a4453bacc5b588e21056902dfe257265032417b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>