Merge "[adb-wireless] Allow ADB-over-WiFi when WiFi is not default"