[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: bd675c051c -s ours am: 129d9a32a9 -s ours am skip reason: Merged-In I56e4eaee6c58fa2918d7fb9ba8ee35800b336118 with SHA-1 a0309b0efd is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libsysprop/+/17805062 Change-Id: I0eecdc172ee3fcfe56fe84d88ec1575aadbdb323 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>