Merge "adb: reunregress waiting for device on start-server." am: 72076d1aa7 am: 31851691d6
am: 986ba5bbbb

Change-Id: I5db3903d12a686394f8ce94078b202a3a52d2d71