am b8055865: am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev

* commit 'b8055865552508d2c5c17ddaf753f731ee4435dc':
  Handling service number convert while roaming.