[automerger skipped] Support optional prop assignments am: d721e870bc
am: 54403635a4
-s ours
am skip reason: Change-Id I9c073a21c8257987cf2378012cadaeeeb698a4fb with SHA-1 598ea49881
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1344820
Change-Id: I810409d13e05db21d11d5fb9912d6ee3bd50cead
This commit is contained in: