Merge "AudioPolicyManager: remove 5.1 channels for Surround Settings NEVER" into nyc-dev