Merge "Remove unstable IpPrefix" am: 184a6ce54d am: fdfa2d00d9

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

Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e
tree: 3846ffc0b9a9a66414b67e326d67c91bc497a8e7
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING