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

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

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