Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 81e3cdfbbc

Original change: https://android-review.googlesource.com/c/platform/external/libdrm/+/1858417

Change-Id: I2b286759ff6188e11a346593b6fa5ff40c783859