[automerger skipped] Merge "Allow some slop on socket time values" into oreo-cts-dev am: 5bb4ad5d54 am: a3700871f6 am: 9bf5d8862c
am: 66203dce16  -s ours

Change-Id: I0ebbc479d080b36dde0fbb4bffaf31b01ea500a5