Merge "Simplify ADB Wifi port listener" into main am: af5be85436

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3540940

Change-Id: Ib637b9b6c04ff472a57cd991126986ca4be08002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>