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

Change-Id: I34aa6c6d7fde8d7a9311a6b9701cbe3f445fa7fe