Merge "Remove usage of networkAttributes" am: 5ccc21eb9b

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

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