[automerger skipped] Merge "system API getSimLocale" am: 4afc5daa73 am: 3f750c2bbe
am: 8ab79b716d -s ours
am skip reason: change_id Ib7288b56ebec117295d524d76ea217a6572a9e76 with SHA1 5d3637b796 is in history

Change-Id: I9e03eaeee15c3e1f747af148ac16422d78c23c3b