[automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over...
[automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d9 am: b42dfed0 -s ours
am skip reason: skipped by user joshuaduong
Change-Id: I2fafbd20f28d3e1d16e9c65204d3dd80e6237532