Merge "getSimLocale should return locale rather than string tag"
am: 7db49c554a

Change-Id: Ieceda5bc3321fa810a2b50e47410f1631aac7691