Merge "[adbwifi] Make AdbManager changes for adb over WiFi."