Merge "Revert "audio policy: refactor getOutput() method""