Merge "system API getSimLocale"
am: 4afc5daa73

Change-Id: I12c79c7425838fa4e5453c310f96624942a5f792