Merge "[automerger skipped] Merge "Use language tags to store Configuration's...

Merge "[automerger skipped] Merge "Use language tags to store Configuration's locale list." into android10-tests-dev am: ad615de8 -s ours" into android11-tests-dev am: 3246426d -s ours

am skip reason: Merged-In I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d4 is already in history

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

Change-Id: I25b657edd207683b45fd9957481060e50259cf4d