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

Change-Id: Iead39e877aec917ff3c409fda1ff0c4dbaa21fcb