Merge "audio_policy.h: Force use for ENCODED_SURROUND_OUTPUT" into nyc-dev