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

Change-Id: I640a4e72df2bf3e43136d8dc70000ba0305a083b