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

am skip reason: Change-Id I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA-1 bd0ce4d42f is in history

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

Change-Id: I2227767506d8851443ea0d24cd330d5475c6e345