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: 5f90df83 am: a0d58c57

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17666830



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