Merge "Bring output of report_sample in line with what perf on my workstation outputs:" am: 61567cc95e am: a423391f22

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1820772

Change-Id: I1c617eb5a2fd8c254f08ccfbd23774650590f4dd