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

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

Change-Id: I9384f29e3d9851d3089e9f29f99e6cfd9da88fba