[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 7a57bfd3f7 -s ours

am skip reason: Merged-In Ic96d929cd04defb201eb5a5034bdadcea7d1dc44 with SHA-1 20f736e3f2 is already in history

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

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