[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 38728b4def -s ours

am skip reason: Merged-In I0c371ece4330a867b5717be0ac4670aefff6736d with SHA-1 8a9d1ab8e7 is already in history

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

Change-Id: I5ff5821e05888e9b0e37e005890ece79073d3e15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>