[automerger skipped] Merge 24Q4 into AOSP main am: 1ee7763f -s ours am: a872c542 -s ours

am skip reason: Merged-In I30da235f86ec3a131ade2342b87f6e9f2313c514 with SHA-1 0e54bd65 is already in history

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



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