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