Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into main am: d59010441b am: c6e69dcc6b am: 553a7df6f9

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

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