[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: cb052073a1 -s ours

am skip reason: Merged-In I15ce7fea77d37640212a6c2572a4d6cc11245482 with SHA-1 5b054f82fa is already in history

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

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