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

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

Change-Id: I04752cc35b52ae97aa5c95650e9744f4affca1c7