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: 89252072

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



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