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

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

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