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

Change-Id: Iedd41f67412c45996407df8c3061153f803b8f57