Merge "Merge "Improve synchronization of ProcessCpuTracker" into main am: 564f051428 am: dc90d17684" into udc-qpr-dev-plus-aosp