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

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

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