[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1f87762e32 -s ours am: 8c12f9ff0d -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: I67ea66f954f77d5965b6624b2c33846af7eae968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>