[automerger skipped] Merge 24Q4 into AOSP main am: 9d16ee99 -s ours

am skip reason: Merged-In I43bf9e11ad021dbad82f6d82163a97a3856e032d with SHA-1 159860c8 is already in history

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



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