Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800

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

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