Merge "Fix latency calculation" am: 1a491076d9 am: a960f82759 am: de95898626 am: c87fe55e4e am: 67340d8690

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

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