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

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

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