Fix unmatched atrace calls

Also clean up one of the other timing/atrace calls to make it more
meaningful again.

Bug: 343789235
Test: Treehugger
Test: Manually checked trace output
Change-Id: Icf0cab12634667ab51dcc025e9b7c0124d2ece0a
1 file changed