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

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

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