Merge "HdmiControlManager with HdmiPlaybackClient API definition"