Merge "update carrierIdProvider index with IccId" am: 09c442bd5f am: 88d26c4c08
am: 6b34ccec3e

Change-Id: I6d760deff3b0a31bbf79588040533861610cb630