Merge "audio policy: fix getOutputFromId and getInputFromId"