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 am: 3a65f333 am: 6b4b7396

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



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