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

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



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