[automerger skipped] Merge "Replace Locale#adjustLanguageCode with its own implementation" am: 81546d66ad am: b03a4e6fff am: 78a110c211 -s ours

am skip reason: Change-Id I474ad621b84da9f7cc7961def6d6751925577d41 with SHA-1 8daac22971 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb55f5c9d3bb42256db631920df4c763735d5dbc