Merge "RESTRICT AUTOMERGE Use HdmiProperties class for all properties that start with ro.hdmi"