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

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

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