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

Change-Id: I629edc9423b6291d9dd02eece5076f98910f1ec8