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

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

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