Merge "Audio Policy: Engine Configurable: Force Encoded surround setting" into nyc-dev