Merge "Fix a bug in KeyAction in HdmiControlService"