Merge "Remove usage of networkAttributes" am: 5ccc21eb9b am: 5498465192 am: 9df643d6b6

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

Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
tree: 5fdacb85736b604e241bf33315bf9b77480e6bc6
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS