Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 61d421c29f
am: 335800627b

Change-Id: I276c35e350be82b01f68c260a39e7b33bab619c1