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: 5f3b7d65 am: 6d24cbbd am: e9d14a7a

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



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