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

[automerger skipped] [vims] better handle assistant force stop am: 1ca358e2 am: 4cccf6cf -s ours am: 28ff9b84 -s ours am: 55139b9a -s ours

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

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



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