Merge "Remove unstable IpPrefix" am: 3afeb0d258 am: 864526f066

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674

Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e