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

Change-Id: Id1e27d793a1f8addf002fa5c42c4a0a8c4cbb828