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

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



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