Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4

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

Change-Id: Ie62012e26e1d44b02ec58beea554e5429aca3088