Merge "[vims] better handle assistant force stop" into udc-dev am: fd772b8d...

Merge "[vims] better handle assistant force stop" into udc-dev am: fd772b8d am: d8f7a6a2 am: c72d620d

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



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