[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: 93ea8b01c8 -s ours am: 096a94798e -s ours am: bc9c4103f6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icb108ddee471a4dea8023c9a79702ba23eaf43ed