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

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



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