Merge "Audio Policy: enable surround sound configuration in xml"