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

Change-Id: Id82be12a54e676c4ad18900ae910e6d08079e62c