Merge "enable drm hal feature" am: d2e9b81df0
am: 765dc9baf1

Change-Id: Ie5f35e1cbbe1ed170d8a942cfa0cbff1c152c250