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

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

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