Merge "[KA13]: add unit test for exposed TCP socket keepalive API." am: f1e012ae9b
am: d3c00327b9

Change-Id: I2a2061df07612a9415528e18c6f741e750127adb