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

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

Change-Id: I64bc4ec0595a488f23d1d4478cbf501c323a62ce