Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 66bc22760a am: 7246f1a563
am: 0f69af35db

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be
tree: 1b6b764a5ae44c6e00e708bccde0033319f04f14
  1. core/
  2. services/
  3. tests/