Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev