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

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

Change-Id: I62818f13c25f1125e5e43ae00d3481ab8014ca34
Signed-off-by: Automerger Merge Worker <[email protected]>