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

* commit '65e74d0b8b60fddc9543c5e954628feb5941dd3c':
  AudioPolicyManager: force encoded surround setting