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

Change-Id: I15df9bb3da077818e0049e7928472ce17d03c8aa