[automerger skipped] Merge 24Q3 to AOSP main am: 53ca477568 -s ours am: f0109b9382 -s ours

am skip reason: Merged-In Ifef2359252724143fcf8f57f9f36a09d71e45c2c with SHA-1 732f3ef60c is already in history

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

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