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

Change-Id: I09b41b2aebd89cfd42c956aad419eec49d0f9c3d