Merge "audio: update audio_policy.conf for usb audio"