Merge "audio policy: fix regression in USB audio"