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

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

Change-Id: Ibc299f6aa03018516d67ff82d5fd192edb3ebeea