Merge "Use mini-resolver instead of alert dialog for dialer work telephony"...

Merge "Use mini-resolver instead of alert dialog for dialer work telephony" into udc-dev am: 096bfe59

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



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