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