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