Merge "[KA04] Expose TCP socket keepalive API"
am: e5f71e4ed0

Change-Id: If8bc33ff30a529092802f9450a3772aaaa401c20