Merge "new SystemAPI to getSimLocale"
am: 5cf41e47fe

Change-Id: I61c7c147efc223000a58ae003231f97756783076