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

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

Change-Id: I6a617ff3c6e8dbbe49459a12169ce42a85f801e3