Merge of http://go/wvgerrit/97444 Bug: 153356263 Test: VtsHalDrmV1_0Target Test: VtsHalDrmV1_3Target Change-Id: Ic27056d86804972859a85c0eb2a0e79a0563d040
Merge of http://go/wvgerrit/97444 Bug: 153356263 Test: VtsHalDrmV1_0Target Test: VtsHalDrmV1_3Target Change-Id: Ic27056d86804972859a85c0eb2a0e79a0563d040