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: I6ba3dad7aefa89ec332331b173818dda4f63a0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>