[automerger skipped] Merge Android 12L am: aab806354f -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: I9379b736b0f56ffaf190d5ab94f82c762ef3ab1a