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

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



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