Merge "Revert "audio policy: concurrent capture""