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

Change-Id: I0f6aff80994404d6c6c579c13853a04596f3e737