Merge "Decouple the configuration from the AudioPolicyManager"