Merge "AudioPolicyManager: force encoded surround setting" into nyc-dev