[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: e615df7a1f -s ours

am skip reason: Merged-In I12649e4f784f98df23d4e9c015cff9e29607ccd2 with SHA-1 c9b9f1cf1a is already in history

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

Change-Id: Iedd99a7741d8ba69211ab049e43dc390cff9b932
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>