Merge "Exposing getPortInfo in HdmiControlService as an HdmiSwitchClient API"