[automerger skipped] Merge "Merge Android 12L" am: 3109954431 -s ours am: cecfacf8ca -s ours am: e6111e23fa -s ours

am skip reason: Merged-In I8bbf321498d25aca1d427d930dba0204391f704b with SHA-1 62f2bd0e41 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2012746

Change-Id: I7646906162b052462251d75da9beff081ce2ac20