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

Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb