[automerger skipped] Merge "Fix wait_for timestamps in Sensors VTS" into...

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

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

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

Change-Id: I3ebcbd7774d7b37fbca9d4cf35804d2fb2ee092f