Merge "route dial out strings to the same number based on service state" into...

Merge "route dial out strings to the same number based on service state" into tm-dev am: dd820cb6 am: 4dd75186 am: 5774c661

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17666944



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