Merge "Merge 24Q4 (ab/12406339) into aosp-main-future" into aosp-main-future am: 3de45347

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



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