Merge "audio policy: enable use of new AudioPolicyManager"