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

am skip reason: Merged-In I4fade3c5f344cd7942273606986a3b43882e5441 with SHA-1 0d22a4544d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/catbox/+/27270748

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