[automerger skipped] [vims] better handle assistant force stop am: 1ca358e2...

[automerger skipped] [vims] better handle assistant force stop am: 1ca358e2 am: 0543ba3b -s ours am: bbf9f909 -s ours am: c9d14594 -s ours am: 2581f393 -s ours

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

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



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