Merge "Add audio_policy_configuration"