[automerger skipped] Merge changes from topic "sysprop" am: dd3af422 am:...

[automerger skipped] Merge changes from topic "sysprop" am: dd3af422 am: 326f1b5b -s ours am: e7ac8c01 -s ours

am skip reason: Change-Id Iba9b61d9779d93e86d9bead2286f945f8d51ab1d with SHA-1 5df5873d is in history

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

Change-Id: If7037588431c0d8401b9959b3527ecd255ee0e07