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

Change-Id: Id8571a8db96770cd699a71c5fcb50fb58c8e511b