[automerger skipped] Merge 24Q3 to AOSP main am: 05b904603f -s ours

am skip reason: Merged-In I4bae1255764b1687e5db6aec799057ac5612c200 with SHA-1 76311aab2a is already in history

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

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