Merge "Do not have HdmiControlService report deviceEvent for TV itself"