[automerger skipped] Merge Android 12L am: 00c493e49c -s ours

am skip reason: Merged-In I809f4aa2beed0fe9cfd7fb7e5ccde1cac73c1a13 with SHA-1 05d5e5fea0 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2013304

Change-Id: I57f29008a307d35237bc1d96f6da2ed5c4cf2533