tree fe4cbbc012f66969229f24042c1d8d72bd0d2fa0
parent 78c7e8b427c16d75cb8ed8d44f657bb8c8572b21
parent 1ccb15b7d31ccb89cf1caa25037ae6d1c2709052
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583519706 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583519706 +0000

Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc5168281 am: 1ccb15b7d3

Change-Id: I1f9b7fd4689aefedb728a58ea421da1014f81580