[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: e460836a34 -s ours

am skip reason: Merged-In I82854b7593984b0dceb9bc9a1aebca89adf034f6 with SHA-1 c16f13f5d1 is already in history

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

Change-Id: I7e168a36c2f55adf53d8365d0bc1c5bedb64cae8