Merge "Add test for NetworkAgentConfig" am: e0959a61f9

Change-Id: I00936490e096c54cebc408a899a18c1dbf9e93ea