Merge "simpleperf: Fix record_cmd#check_trampoline test" into main am: 09fbf35747 am: baf5fedc51

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

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