Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92 am: 0835287e0e

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

Change-Id: Ibd6a880835ea60e9592ac64d6c2154448b682f99