Merge "Remove system audio output option for HdmiControlService" into lmp-dev