Merge "configs: remove surround recording support from audio policy config xml"