Merge "Add new key in CarrierConfigManager for ICCID display." into nyc-dev
am: 34b90a8

* commit '34b90a8ce3b3721a3bfcee15c780cdf45f712585':
  Add new key in CarrierConfigManager for ICCID display.