Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into main am: d59010441b am: 0905ed59c8 am: f7124b9564

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

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