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