Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7e5 am: 08e1787088
am: d24f3fc8b1

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be