libdrm: Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: e2e1ef32ee

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

Change-Id: I6c959443ab1c2831e9d268f70b29c9e60dc126e1