[automerger skipped] Merge "refactor updateIccId for msim" am: 30b6573ec7 am: d82aaacf6a
am: 1aab69aefc -s ours
am skip reason: change_id I9708dea75f6bcf1db82fed7f42d7c2828b192583 with SHA1 9f1beb6b3c is in history

Change-Id: Iebc19865bf6d85c2e6fad5aa8c6562a43694b2e5