Merge "AudioPolicyManager: force encoded surround setting" into nyc-dev am: 65e74d0b8b
am: a3b8c24661

* commit 'a3b8c24661eb8d7bab718029dbbfe35b4cfc57ac':
  AudioPolicyManager: force encoded surround setting