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

Change-Id: Icc3f2a504fdedb5559d1c6ab8df5d52e3d070c64