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

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



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