Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into...
Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f34896 am: b7aade04" into oc-mr1-dev-plus-aosp
am: e2e83010
Change-Id: Icc6c24fe9cceb0884b9cac5568fdcd4477c88626