Merge "Merge "Improve synchronization of ProcessCpuTracker" into main am: 564f0514 am: dc90d176" into udc-qpr-dev-plus-aosp am: cae3e9ef

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



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