Merge "Building NetworkAgentConfig in shim instead of in test" am: 43b5e2e766 am: cb240127a4

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

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