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

Change-Id: Ia5c108bfa42ab0de9d4cdf676c5980dc9a9aba12
tree: 71bb6e23a981d8086cec652a0c7aa5f0eefac730
  1. core/
  2. services/
  3. tests/