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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c0ca6e6996daa36e54cf197cff50a8f6101b446