Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev
am: 21f3489653

Change-Id: I357a84f9249c466bd259798d3d073886a61af8f0