Merge commit 'ecc9989f2c8394cad87ad4ebcb4f6b9f7706861c' * commit 'ecc9989f2c8394cad87ad4ebcb4f6b9f7706861c': Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.