Merge "Remove usage of networkAttributes" am: f6ecb0017c am: 1a0ccc5771 am: 0aff3ed968

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

Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b