Merge "audio policy manager refactoring."