Merge "Revert "Revert "Unhide IpPrefix(InetAddress, int)""" am: 37ff6df023

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

Change-Id: Ide524a4a22ca42bfa9a48b6144d061781452c69d