Merge "Remove usage of internal APIs from InetAddress and ServerSocket" am: c577c271ba

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1737102

Change-Id: Ib9be6dd9c82c00e36eab3c9490a69d71e3dfbc4e