Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 18dbf64e am: fd6dc07b am: 907cd0eb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4dece877244e6a3641918f9563378753c8bb3d4f