[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 70f248df46 -s ours

am skip reason: Merged-In I8f66a6d70df693879d2440300f88632070f4f75d with SHA-1 edf334f3e9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/lock_api/+/27145241

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