Merge "[KA02] internal cleanup and refactor for SocketKeepalive"
am: df74b66a49

Change-Id: I60e1780e34c1cd3a8f1e8ce38dc53843133660dc