Merge remote-tracking branch 'origin/rvc-gsi-dev' into rvc-qpr-dev am: 51f38d4b67

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

Change-Id: I8069459249ffe239a87242d0d212e0c7feb08c6d