[automerger skipped] Merge 24Q4 into AOSP main am: 3b26198071 -s ours

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

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

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