Merge "Adding USB Headset awareness." into oc-dr1-dev am: f56b57781e
am: 1ae4273154

Change-Id: I24ffbb79b965df15a22dbc5d6ce3ae90ddb27b50