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

am skip reason: Merged-In I6ce6a9e7ea2c210e25c2a5ffadaaa6348086ea7f with SHA-1 a791e913 is already in history

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



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