Merge "Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54" into oreo-mr1-cts-dev