Merge "adb: make disconnect stop reconnection immediately." am: 90668749e9 am: b40d628fd0
am: a97bb74803

Change-Id: Ia0f4eafa4b7f97fdb5e7ed8f6f03d6c8b71f7db1