[automerger skipped] Merge "Use language tags to store Configuration's locale list." into stage-aosp-master am: bb326f9a80 am: 396c4ea65b
am: 893334ae0e -s ours
am skip reason: change_id I53946ed4e31de0ffe9c84875c391a7dec6f5375a with SHA1 bd0ce4d42f is in history

Change-Id: I74058cfd7be11f3262ce94d523892c88977f87c0