Merge "Merge "Merge "Fix logic for Intent.ACTION_HEADSET_PLUG for USB headsets" into oc-dr1-dev am: 21f3489653" into oc-mr1-dev am: c82e45029e" into oc-mr1-dev-plus-aosp
am: f8d4e95f34

Change-Id: I8a3961ae7207d6da7b84c8e379cd02574cf378f0