[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: ca4c4feea1 -s ours

am skip reason: Merged-In Ie78965b1ceb3f3cc777e005a9df1f75b866becc6 with SHA-1 daf86bda81 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/graphics/gs101/+/30285412

Change-Id: I2d8b51d33a41aed94216db74e8e3fdbd640ec72b
Signed-off-by: Automerger Merge Worker <[email protected]>