adb: improve race between device_connected and device_disconnected. am: f74dd42e4e  -s ours
am: 29c0882ad9  -s ours

Change-Id: I7a96ab6c8bccb622fcb984a5c88ae58960b18818