Merge "simpleperf: handle events collected by --add-counter in pprof profile" into main am: 713c837c7a

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

Change-Id: Ic740c94f147e20da0337e3dfd20011e0abf3547e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>