Merge "Finish mini-resolver after user action." into tm-dev am: 831370bf am:...

Merge "Finish mini-resolver after user action." into tm-dev am: 831370bf am: 68bdb03d am: 01ca540e

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



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