[automerger skipped] Merge "Remove usage of internal APIs from InetAddress and ServerSocket" into sc-dev am: 99c7bdb1a4 -s ours

am skip reason: Merged-In I77a419c459ee53b36d24f324ecab2b5dae5744de with SHA-1 ef88fadc2e is already in history

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

Change-Id: I100bfcaa03d6cb5715b0632ba546cc3608fced6c