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