Merge "Add SocketUtils CTS tests"
am: 6aff608375

Change-Id: I2a297b78ebaa2347d351ddd81fc35f68994ad93a