[automerger skipped] Some properties are set as optional am: 19746f4686
am: 30ab9d1904
-s ours am: 424864237e
-s ours
am skip reason: Change-Id Ie6a50ab7e0bcb210e282bc18e8c1daf412903f90 with SHA-1 7b933fb576
is in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1344823
Change-Id: Iba89ce685ffd30b6fc3df14c56ac9e0d33647083
This commit is contained in: