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

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

Change-Id: Icb5050d3370b1c8c4e94bd3d21bafa36201da883