[automerger skipped] Merge 24Q3 to AOSP main am: e66118f7d7 -s ours am: edd433780a -s ours

am skip reason: Merged-In I614b7659db8bf01af5ae912d2c8e10c5a163c5a2 with SHA-1 81488d0f5c is already in history

Original change: https://android-review.googlesource.com/c/device/generic/goldfish-opengl/+/3255565

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