[automerger skipped] Merge "Revert "Avoid re-running kati unnecessarily.""...

[automerger skipped] Merge "Revert "Avoid re-running kati unnecessarily."" into main am: a32d67dd am: b1776d96 -s ours

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

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



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