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

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

Change-Id: Ief43b2ffa7f3ef3a4cebf2d35148d3b7e66cb7ef