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

Change-Id: I5ddccb153bdbf7a34d03a2a511fb93cfa3522c62