Merge "Remove usage of hidden InetSocketAddress constructor" am: 71ef86e01a am: d340bc1251 am: afcdfff9c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b76d3c6e18c2c38d86c5c4bd5a75b6a02437a4