Merge "[automerger skipped] Merge "Revert "Use language tags to store...

Merge "[automerger skipped] Merge "Revert "Use language tags to store Configuration's locale list."" into android10-tests-dev am: 73d16b7f -s ours" into android11-tests-dev am: ea7ac3b9 -s ours

am skip reason: Merged-In I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d4 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I88e07ac97d6d5d3749182918c2a5a341b9cca6c8