[automerger skipped] Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev am: fed6186c74
am: a925c17f4f  -s ours

Change-Id: If4af96af0145860a8dbdc0a3bd9955dadfe68c66