[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6 am: 1732e54ca5
am: 98afe69ae9 -s ours
am skip reason: change_id Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e with SHA1 e413528700 is in history

Change-Id: I6aea18280ee55740725a73d969a6485b69cb0521