Merge "add normal routing for numbers in GP and RE" into udc-dev am: 44b5661c1a

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

Change-Id: Ieaa4332837a9136904bd03a708170eb91ca321e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>