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

am skip reason: Merged-In I6ffd20c669a2fa6c34410c9c8b1dd2e3c59bffcb with SHA-1 43f509924e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/27274004

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