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

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



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