[automerger skipped] Merge Android 13 QPR1 am: f5f118e388 -s ours am: 710d51d810 -s ours

am skip reason: Merged-In Id60cdf79f20237de1c88ab6f280a8d0ef587b8e5 with SHA-1 fabe368051 is already in history

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

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