Merge "route dial out strings to the same number based on service state" into tm-dev am: 5f90df83

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



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