[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7c112657 -s ours

am skip reason: Merged-In I3e2152d0e109ecc6c89c249dea678afc93faf62b with SHA-1 3d9c9aac is already in history

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



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