Merge "Building NetworkAgentConfig in shim instead of in test" am: 43b5e2e766 am: cb240127a4 am: 429e4bedb4 am: 05cb47949f

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

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