Merge "Use HdmiProperties class for ro.hdmi.device_type"