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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ca948bdb0c688b53f8808f7c948aa1b5363fbab