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

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

Change-Id: I5c7adafdfadbf30099ecd8590fd596770da63b12