[automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: cb7455c1f6 -s ours

am skip reason: Change-Id I6d1dd46edba0ad69586791935fca0da484ef2746 with SHA-1 4744ee6eb6 is in history

Original change: https://android-review.googlesource.com/c/device/google/taimen/+/1347164

Change-Id: I6421c2bcd0d8252ec1aafe0c316ebbca46f6fe20