Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0

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

Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e
tree: f7df088a46592895a262d7a8270a377dd1a6f079
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING