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

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

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