[automerger skipped] Point directly to generated c sysprop_library am: ce6fcfd190 -s ours am: 1240e0d6e1 -s ours am: db679b994b -s ours am: 3d5ecbc873 -s ours am: 053163035b -s ours

am skip reason: Merged-In If7eea235853536004e1201fd810e2552bdfc95ef with SHA-1 e4d3b9982a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2120012

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