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

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



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