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

Change-Id: Ife2c15f2dd87001a44049293a8e5a446d025ebe1