[automerger skipped] [vims] better handle assistant force stop am: 145b038c...

[automerger skipped] [vims] better handle assistant force stop am: 145b038c -s ours am: 5ae17483 -s ours

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

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



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