Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android14-tests-dev am: 0c62c513d9" into main am: b6a90014a0

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

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