Merge "[automerger skipped] Add CTS test for NetworkAgent/NetworkAgentConfig API am: 42096be0c6 -s ours am: 231c832781 -s ours" into sc-v2-dev-plus-aosp