Merge "Decouple the configuration from the AudioPolicyManager" into udc-dev