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: 73f46cef

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



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