Merge "sysprop: Remove commits to void build break" into main am: 130bf250

Original change: https://android-review.googlesource.com/c/platform/build/+/2794413



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