[automerger skipped] Merge changes from topic "sysprop" am: dd3af422a2
am: 326f1b5b2e
-s ours
am skip reason: Change-Id Iba9b61d9779d93e86d9bead2286f945f8d51ab1d with SHA-1 5df5873d26
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1353428
Change-Id: Id6cfac02187d095be705d381e3faf2b3a9b98cd6
This commit is contained in: