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

Change-Id: I2d9107c6e50ba94f9bfe39bfbcb79c1a5390f0a6