Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c853c

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

Change-Id: I821c9590a01c4890ba9e5967dcdc5bd92fd5ec1a