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

Merge "Merge "Reread the tls port on adbd restarts." into rvc-dev am: 9e7a8c85 am: 9f8827b5" into rvc-d1-dev-plus-aosp am: ab8d5bad am: 74ec90b2

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

Change-Id: Ibb7984d2dfeaabf9add5342e996e1540853d5a56