[automerger skipped] Merge "Generate system diff between KATI and SOONG" into...

[automerger skipped] Merge "Generate system diff between KATI and SOONG" into main am: f9599479 -s ours

am skip reason: Merged-In I25c71f88d16a4efb873c21abe70ca9c41c6423ca with SHA-1 f5a52d9a is already in history

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



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