Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 8324c3e7 am: 08e17870 am: d24f3fc8 Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be