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

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

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