[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6 am: 3527414d22
am: cba6514494 -s ours
am skip reason: change_id Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e with SHA1 3a5caf833b is in history

Change-Id: I6aea18280ee55740725a73d969a6485b69cb0521