Merge "Add TYPE_USB_HEADSET to WiredHeadsetManager" into oc-dr1-dev
am: f163650040

Change-Id: Iec335920d92827117eca9884687d25eecbd6e2a3