Merge "Add ResourcesLocaleTest#testDeprecatedISOLanguageCode test" into main am: 704d2fffec am: 1b53d7fc34 am: 0b938dae1b am: 22399c4f96

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

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