[automerger skipped] Merge "[vims] better handle assistant force stop" into...

[automerger skipped] Merge "[vims] better handle assistant force stop" into udc-qpr-dev am: eb40419e -s ours

am skip reason: Merged-In I180e699bd8d3fb5ea6aa4807f435060999436416 with SHA-1 ba9625e6 is already in history

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



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