Merge "Remove usage of hidden InetSocketAddress constructor" am: 7e9e7dce89 am: ba744b34b8 am: afcdfff9c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8b76d3c6e18c2c38d86c5c4bd5a75b6a02437a4
tree: ff3feac7949e0de8050b80ea79b5c34c8b53b595
  1. framework/
  2. service/
  3. OWNERS