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

am skip reason: Merged-In I1b3f0c92d349e8c8760821cf50fb69997b67b242 with SHA-1 555d2393 is already in history

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



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