Merge "Format Numbers correctly for the Network" am: 2dfc83131b am: a66010b676

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1585416

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00ba6c0cd38e31ab9b61b6c4158bac4274191d47