Merge remote-tracking branch 'aosp/upstream-main' into main am: 908303a901

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

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