Merge "Add new key in CarrierConfigManager for ICCID display." into nyc-dev