Merge "Enable DRM HIDL HAL by default"