Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android14-tests-dev am: 1da3c129ce" into main am: a17dcfdb4a

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

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