[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 7118ee48ff -s ours am skip reason: Merged-In Ib8fd53fa76fd1767d56653e0baae263d4f73c822 with SHA-1 a9c19914f2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/30284080 Change-Id: I28c2ae53fce7854096bc6c55baf0874eef6acff8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>