Merge "Use the system property for the HdmiControlService configuration." into lmp-dev