[automerger skipped] Merge 24Q4 into AOSP main am: a211f66164 -s ours am skip reason: Merged-In Ib8fd53fa76fd1767d56653e0baae263d4f73c822 with SHA-1 a9c19914f2 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libsysprop/+/3412522 Change-Id: If94336ef5a31d2af55f934fa086fec85b18d93c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>