Merge "Fix VtsHalDrmV1_0Target test failure" into oc-dev
am: 1fd47b29b3

Change-Id: I947939edad4fc89c4e58119581205874e17cfdbd