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

Change-Id: Ie62d2dfb45057ddea806092731152eee4f1889eb