Merge "Remove networkAttributes resource usage" am: 584cfc6b67

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708

Change-Id: I94c174ca3ee356706947f213cb05d0a47deff233