Merge "Refactor AudioPolicyManager"