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

am skip reason: Merged-In Id872631a932cff423f177a6a15bc99e221d592b0 with SHA-1 d1ce975d7b is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/graphics/gs201/+/3413666

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