[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: df74b66a49 am: 7e4a1fa3c2
am: c895e9a53c -s ours
am skip reason: change_id If1345fd3c3ad6cce3074c532386da3befe211795 with SHA1 5ccf31d171 is in history

Change-Id: Iea300ed084cde6143aa7d9df1ac8bda8dc65156c