Merge "adb: fix authentication when reconnecting."