Merge "[automerger skipped] Merge "Merge "simpleperf: fix check_trampoline_after_art_jni_methods test." into android12-tests-dev am: 8aff5ada38" into android12L-tests-dev am: b2dee26f98 -s ours" into android13-tests-dev am: 6779e405d0 am: d766f83731

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

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