Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f617d
am: bca04acac5

Change-Id: I5525317d5a0a13c2f5d5291c552b76c293d0bdb2