Merge "Add test for NetworkAgentConfig" am: e0959a61f9 am: d5182176a0 am: 97a57532f4

Change-Id: I77d873c671bc4aad5402a8d30fc54c670001385b