[automerger skipped] Merge "WiredAccessoryManager: fix connected state logic for Extcon" am: 134fe7616b -s ours am: b440af671c -s ours am: f32be08a79 -s ours
am: 270a2913a6 -s ours
am skip reason: change_id I618031968a4131ee153994deca55d192cbc598b3 with SHA1 89920d8ba2 is in history

Change-Id: Ib0227b36900a81aa3e397fb5a2d8720ca5ddc615