[automerger skipped] Merge "[KA02] internal cleanup and refactor for SocketKeepalive" am: 292da961e6 am: 839c99be82
am:9a003aaebc-s ours am skip reason: change_id Ia9917d12987e91e87e34ffb3f126e7bc7c9c187e with SHA11fb0c95661is in history Change-Id: I6aea18280ee55740725a73d969a6485b69cb0521
This commit is contained in: