Merge "Do not convert time to float" into tm-qpr-dev am: 9bcb646d am: b878ded4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/19464352



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