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

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

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

Change-Id: I7de0554c6f0d3b39c612a9804025a309685edb14