[automerger skipped] Merge "Merge "simpleperf: Fix record_cmd#check_trampoline test" into android12-tests-dev am: 927e0ca800" into android12L-tests-dev am: d9fb8dd703 am: 0498708589 -s ours

am skip reason: Merged-In I401b091e27e7b3ae86f003a270b53be4060c922f with SHA-1 b347fdbef6 is already in history

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

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