Merge "audiopolicy: Refactor XML deserializer for the APM config"