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

Change-Id: I615a1237144bcbd4d6753265f694c19a13ceed5f