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

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

Change-Id: Idfa92d12a45385412c2013637c657acfb9fec3a2
tree: a6756ede4e6e40d837814af09925506adcff199a
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING