[automerger skipped] Merge "Fix wait_for timestamps in Sensors VTS" into android10-tests-dev am: 87a9018aa9 -s ours am: 4fe500d87f -s ours

am skip reason: Change-Id Ibba59dbf9312f97d7275e5aa8cd36547ab09e328 with SHA-1 eac8d9acc9 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1167937

Change-Id: Ifa9f721ceb7e1dd2482e3562f612c62237a37e98