Merge "Remove usage of networkAttributes" am: adf6d20f8f

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

Change-Id: I52a3125843e093c5a7d0d80c2a5c9608b397ea00
tree: 957b0d39f3088f7e14ad528e1ceaebe5a3aab8c2
  1. framework/
  2. service/
  3. OWNERS