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

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

Change-Id: I6676717a12df4523c24f3c64da83678ed70fbf28