Merge "Remove usage of networkAttributes" am: adf6d20f8f am: e74de6db5a am: 0aff3ed968

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

Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
tree: 123de85825b3178584efdc8c2b1d7ec07b02eabd
  1. framework/
  2. service/
  3. OWNERS