Merge "Address proportional counting for out-of-order timestamps" into tm-dev...

Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90f am: 91fe8519 am: 760bd1e4

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



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