Merge "HDMI: Fix failing tests under android.hardware.hdmi"