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

Change-Id: I3a77ec0fe45d48715b11c27db9c1a6c2d7590c7f