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: a2922743

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



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