[automerger skipped] Merge Android 12 am: b2eae53071 -s ours am: 08252fe717 -s ours

am skip reason: Merged-In I30b71cd8e60526def44f87137037b965d969834c with SHA-1 d3b2f71bea is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/ArtPrebuilt/+/1847387

Change-Id: Ia9afdcc563e8b04082fca80b98a85bbd4d7f9e53