Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88...

Merge "Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88 am: 928e81ae" into rvc-d1-dev-plus-aosp am: 93dc50a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11828521

Change-Id: Ic783aa228c98f02d3cf823a4f9b7c01cc8c96044