Merge "Add Quad channel output to AudioPolicyManager" into lmp-dev