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

Change-Id: I26851e3f263dafbe2d39e2859f7765e0f21e4e3b