Merge remote-tracking branch 'aosp/upstream-master' into master am: a0994de9ca

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If64336268347c58b37565c62f24b9c24cc7773de