Merge "Add SocketUtils CTS tests" am: 6aff608375 am: f97246a87c
am: f7dc1260d9

Change-Id: I36fb368217ff50319ae6f853f0d22cfc79541b40