Merge changes from topics "cdma_eri_api", "cdma_eri_displaynumber"

* changes:
  Replace IconIndex as DisplayNumber
  Expose CDMA ERI API