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