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