Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 5fdd1748fa am: b7ed180e64
am: 7f8cfa3536

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