Improve reconnect logic and fix race condition

Bug: 10184182
Test: Device reliably reconnects after disconnect
Change-Id: I14dc9c62fe83776bb4b407a4127fdbfb10143a5f
2 files changed