Merge "Fix time handling problem in DataPaths test." into udc-dev am: fc635e26a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23817828

Change-Id: I50bc2e3f63ac3b395ae5e11b68449c41533d7ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>