[automerger skipped] HID: Fix HID connect issue skipped: 339badc75b

Change-Id: I79b0b79143d10c39e0f51ba1a064864153f16273