Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f617d am: 241100cb87" into oc-mr1-dev-plus-aosp