Merge "Revert "Use language tags to store Configuration's locale list."" into android10-tests-dev