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

Change-Id: If5201fbe5d198fa9f2db81ae873540ff07a9b56e