[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 15799d0e20 -s ours

am skip reason: Merged-In I70318dc8b197a93d0f791ac968fc03b7aaf2efaa with SHA-1 4bf401a5f8 is already in history

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

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