[automerger skipped] Merge "new SystemAPI to getSimLocale" am: 5cf41e47fe am: 1b607c875f
am: 59691cc266 -s ours
am skip reason: change_id I8f78ba00abf0ef74bd2b2147755596edaee156cf with SHA1 108f948ffa is in history

Change-Id: I0e040ce7e13d67d8b805bc31988cf1ddb04abdfa