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

* commit 'ba5ba7a2408de8a3ac40d3bf0ed18141bee2fada':
  Remove system audio output option for HdmiControlService