Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725

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

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