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

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

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