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

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

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