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

Change-Id: Ia5c108bfa42ab0de9d4cdf676c5980dc9a9aba12