Merge changes from topic "cuttlefish_lavapipe" into main am: 585315e4db

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

Change-Id: I9f28736b3d3c9783ed3c20cf1dfd66cce613c21a
Signed-off-by: Automerger Merge Worker <[email protected]>