[automerger skipped] Test onStartSocketKeepalive am: dce3e15cd3 -s ours am: 0a4984e430 -s ours am: 43497590d6 -s ours am: dceb3f2d59 -s ours
am skip reason: Change-Id I4e251fa0203a1888badef9ed90495fe8b3340a1c with SHA-1 570b76b273 is in history
Change-Id: I55f1a2fda9d79b125a5da5356755ea70615afe16
This commit is contained in: