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

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

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