[automerger skipped] Merge "getSimLocale should return locale rather than string tag" am: 7db49c554a am: 6841e3ce85
am: 1d8be8bb80 -s ours
am skip reason: change_id I850108ce0905d16e538e46ccd4bbf92a2bcfba42 with SHA1 199041f503 is in history

Change-Id: If7830ca281936ced67399a26e3fdb76cc5c9aef8