Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into...
Merge "Merge "Update isWiredHeadsetOn() to support USB headsets." into oc-dr1-dev am: 75384f61 am: bca04aca" into oc-mr1-dev-plus-aosp
am: 3c1f70bd
Change-Id: Ib41c853312769cc5a47407c5fc7c81a2447ece7c