[automerger skipped] Merge "WiredAccessoryManager: fix connected state logic...
[automerger skipped] Merge "WiredAccessoryManager: fix connected state logic for Extcon" am: 134fe761 -s ours
am: b440af67 -s ours
am skip reason: change_id I618031968a4131ee153994deca55d192cbc598b3 with SHA1 89920d8b is in history
Change-Id: I75c060454d305baf4d4607d53b15962d0bce7421