Merge "Teaches the ProcessCpuTracker about USAPs." am: 3bc51682 am: 1ccb15b7 am: 3ceb4bd3 am: 4c007a13 am: b9db7e93 Change-Id: I34aa6c6d7fde8d7a9311a6b9701cbe3f445fa7fe