[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 89bd104105 -s ours am: 336028e2a4 -s ours am: aff186a281 -s ours am: 141c3c5a65 -s ours

am skip reason: Merged-In I0caa8e28c7387a976931305b867d098b8265dd03 with SHA-1 e8d053b0f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mesa3d/+/17544766

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