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

Change-Id: I1f9b7fd4689aefedb728a58ea421da1014f81580