Merge "[Telephony MainLine] To use ActivityManager.setDeviceLocales to replace...
Merge "[Telephony MainLine] To use ActivityManager.setDeviceLocales to replace Configuration" am: 538afed3 am: e729c826
Change-Id: I504481bf68efcd541d2d14b0b5600c72347dd475