[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 2448a586d2 -s ours

am skip reason: Merged-In I04dce5c4a3a5ae57d0c3da8e4a924e6e02eb4949 with SHA-1 3b38d3e01d is already in history

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

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