Merge "refactor updateIccId for msim"
am: 30b6573ec7

Change-Id: I3e32878c9d7f4514aaf9637175fbcce6b4c74608