Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev