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

Change-Id: I75c060454d305baf4d4607d53b15962d0bce7421