[automerger skipped] Merge Android 12L am: 0e60d07f08 -s ours am: 151760829a -s ours am: 32d40b15bf -s ours

am skip reason: Merged-In I530870ba88f12d1250aed3e89a049a35dc0756ee with SHA-1 e1aa5446d7 is already in history

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

Change-Id: I60ad0b8a8201d671bdb138125b1a574fb3f93228