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

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



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