Merge "refactor updateIccId for msim" am: 30b6573ec7
am: d82aaacf6a

Change-Id: I66b50242db3036fa391507fdac4a9f449b6b5b7e