Merge "audio policy: add option to use new policy manager"