Merge "Replace Locale#adjustLanguageCode with its own implementation" am: 81546d66ad

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib05c4b154b14389a3778d09fdc73e427c1f46bd4