Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev
am: d017754253

Change-Id: I1c295d68bcc554a685221f6e761cab87a4fec632