Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev