Merge "Updates to AudioPolicyManager refactor"