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

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



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