Merge "Show mini-resolver dialog instead of alert dialog" into udc-dev am: 315b16f59f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22744742

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