Merge "Audio Policy: Engine Configurable: Force Encoded surround setting" into nyc-dev am: ba388ac
am: 18a0864

* commit '18a0864394a76a525f8f65fcc8400307f5a4caf5':
  Audio Policy: Engine Configurable: Force Encoded surround setting

Change-Id: Ib118d6ef718cd71dc21ea62611b297276522c5f4