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

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

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