Merge "Refactor audio policy install logic for clarity"