[automerger skipped] Merge aosp-24Q3-ts-dev am: 21c9b0403d -s ours

am skip reason: Merged-In Iec9bfa6bb2c1b3fbc5a7ba999dabf9a4371e1ba9 with SHA-1 a2ca642d70 is already in history

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

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