Merge "Fix latency calculation" am: 1a491076d9

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/2159430

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