Merge "Revert "HDMI: Include intents that are implemented in HdmiControlManager"" into main