[automerger skipped] Generate system diff between KATI and SOONG am:...

[automerger skipped] Generate system diff between KATI and SOONG am: 8376b32e -s ours am: 10def959 -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: Ie4436bd35dc4034b07f612a0b5fbd327c7071b15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>