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

Change-Id: Ia1ffeff18ca55656038d655bd3b17e51b5f3af36