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

Change-Id: I9e1845c9e598e14e9746a550c7a77e2428449563