Merge "Building NetworkAgentConfig in shim instead of in test" am: 43b5e2e766 am: 388abe941a am: a90f320836

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

Change-Id: I6c073ce07b77dccf3e7c2d43b39cef25d00b4461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>