Merge "Add CTS test for NetworkAgent/NetworkAgentConfig API" am: 99e50a0fc9 am: e803a53246

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

Change-Id: If7ddb3f87320a91e1cdda33c99f108c32a760b6d