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

Change-Id: Icf37ca3cf05a26bee1ace6b85ca23c665fe603b7