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

am skip reason: Merged-In If48f56757e069a467a8ae0466820f27f97b011a8 with SHA-1 4508ca9e is already in history

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



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