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

Change-Id: Idd92de1cd2517dd7c5113076b9a4a18f1cca64c8