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

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

Change-Id: Iffc2da273156fc670834b809b06b5cfbb0c2c0ac