Merge "audio policy config: add USB_HEADSET device" into oc-dr1-dev am: 10c94f7a68
am: f70ecda754

Change-Id: I1c1b8e69c0aaf0b029cf5129031404088afcbaab