Merge "adb: fix authentication when reconnecting." am: 46d19d34d1 am: 10e7241ede
am: 4600be8689

Change-Id: Ia338b810866547cb4c86cb236e9f81a25a5ce297