Merge "system API getSimLocale" am: 4afc5daa73
am: 3f750c2bbe

Change-Id: I8163a71a0e75b3aa19734fc6d5f6b47e78595ccd