[automerger skipped] BUILD_BROKEN_DUP_SYSPROP as escape hatch for the new sysprop restriction am: 0b4fccb6 am: 9803361a -s ours am: cfc7fb1f -s ours am: a68c2ed8 -s ours am: fad7dd73 -s ours

am skip reason: Change-Id I7bdfffd47d50aad66a78e28a30c3dad7ebac080c with SHA-1 58cf0e09 is in history

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

Change-Id: I6e0077bb243ad603fd7daf41857bdf009d3242b8