Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 81e3cdfbbc am: c907213a61 am: e8ed23f084 am: 8c0ea9aec3 am: 515e79c764

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

Change-Id: Ia6ade8f9b8fe1c618978130e1b784a75a20563a9