Merge "Support HdmiControlService.sendKeyEvent for both TV/playback device"