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 am: f4075745

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



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