[automerger skipped] Merge "Fix failing drm 1.0 vts tests" am: 9367cc5918
am: 04f664a094  -s ours

Change-Id: I350ed9bc3229f03feee396b36868b3f0d605f9cb