[automerger skipped] Merge "Merge "simpleperf: Fix flaky test check_trampoline_after_art_jni_methods" into android12-tests-dev am: e4cc9c7725" into android12L-tests-dev am: 6b5a8b2336 am: 5cec5340a8 -s ours

am skip reason: Merged-In I846cd2bbf1159abf05e9d754c2e96c12912c7d72 with SHA-1 31ec381052 is already in history

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

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