Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c85 am: 9fc04c68 am: 228ea781

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

Change-Id: I83fb5fd10fddcb0b401ba062bd52573ecbee3f1b