[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 98976281 -s ours

am skip reason: Merged-In Ia941d67a5248641246a7298487c6a13fe92d8d66 with SHA-1 267207a1 is already in history

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



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