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

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

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