Merge "AudioService: add support for ENCODED_SURROUND_OUTPUT" into nyc-dev