[automerger skipped] Revert "Avoid re-running kati unnecessarily." am: cfb69bd1 -s ours

am skip reason: Merged-In Ic85be1da3765656cef8da4ec03d0b1ca7d5d625e with SHA-1 5e325d42 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27384521



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