[automerger skipped] Merge "[adbwifi] Make AdbManager changes for adb over WiFi." am: b9f266d97c am: b42dfed0f4 -s ours am: 6683393d9c
Change-Id: I420b10b85f255d87e368737acaa21b059fbd8cf5
This commit is contained in: