[automerger skipped] Merge 24Q3 to AOSP main am: 821ef5274e -s ours am: a1d70e0ca1 -s ours

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

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

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