Merge "Fix proportional counting for out-of-order timestamps" into tm-dev am:...

Merge "Fix proportional counting for out-of-order timestamps" into tm-dev am: 80907f72 am: e5d69a51 am: a9ab246f am: 1b154893

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



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