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

Change-Id: I3352c141d9fe8b940e9d222c043a39376244b1cb