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

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

Change-Id: Ie33d15feab78d492d010e23906634be16e0f9d72