Merge "VtsHalDrmV1_0Target test failure" into oc-dev
am: c68698337c

Change-Id: I27822a0c35274a1893ee0ebad50046a0f14a981e