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

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

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