[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 4662ad3f2b -s ours

am skip reason: Merged-In I3ea4598a19db32e78d21b5f3c942bdc92a375f99 with SHA-1 3b92ed367c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/jsr330/+/27273863

Change-Id: I03cd44fee45876773954485f2501102f3f1ebd64
Signed-off-by: Automerger Merge Worker <[email protected]>