[automerger skipped] Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours am: 9511f8dfee -s ours am: e371085cdc -s ours am: d39aa6d77b -s ours am: 8e260d51b8 -s ours

am skip reason: skipped by user yabinc

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

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