Android 12.1.0 release 18
Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca am: e2d45bd078 am: 06edf3d045

Original change: https://android-review.googlesource.com/c/platform/external/virglrenderer/+/1621572

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf8073775ac1f69bbc5a7722b44b0b8d1601255f