Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 18dbf64e61

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb02ee58fd5f1e948a59abcc24c1a01d646e6bd3