Merge "simpleperf: Fix dumping build id for system wide etm recording" into main am: 533fc04f80

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

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