[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 4abb646978 -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: I58e7dcd2b8251eb2aa727032c28785ffed592a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>