[automerger skipped] Merge "[Telephony MainLine] To use ActivityManager.setDeviceLocales to replace Configuration" am: 538afed3 am: e729c826 am: c2acc532 -s ours
am skip reason: Change-Id Ibac75781aefefaf2f36866118a5ee626e72ff9b4 with SHA-1 bb6fd876 is in history

Change-Id: I04825f3d6199d08dc836eabaf5098aac51f80dfb