Merge "Address proportional counting for out-of-order timestamps" into tm-dev am: 860fe90f am: 89252072 am: 63f6625a am: 1292aeb5

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



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