[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 2e555bb246 -s ours

am skip reason: Merged-In I87a1e2961f6737d107687d130e87324d3649c71b with SHA-1 4e234630aa is already in history

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

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