Merge of go/wvgerrit/93524 Bug: 134787536 Bug: 148895349 Test: VtsHalDrmV1_3TargetTest Change-Id: I48fb63d044271243fa1d290443d437f0697994d3