[automerger skipped] Some properties are set as optional am: 19746f46 am:...

[automerger skipped] Some properties are set as optional am: 19746f46 am: 30ab9d19 -s ours am: 42486423 -s ours am: 6ea63976 -s ours

am skip reason: Change-Id Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90 with SHA-1 7b933fb5 is in history

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

Change-Id: I85f9b9e1e68a8fec8b43b56df9f6d3eb23f2c7e1