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

Change-Id: I11e638a2fab004979298708a5c75bb7c2f208f67