Merge "new SystemAPI to getSimLocale" am: 5cf41e47fe
am: 1b607c875f

Change-Id: I2a6c1b9aaab034763f261d7464bd302ad5bbdd2d