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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifee26f1cb8ca2d0c57034a28fca767cb3afc4f20