Merge "Allow more leeway to fix sys_time.gettimeofday flakiness."
am: 4ac3709f66

Change-Id: If533f21f152c0e4a08f897ea63dc3f5ad4270fae