Merge "Fix wait_for timestamps in Sensors VTS" into android10-tests-dev