[automerger skipped] Some properties are set as optional am: 7b933fb5 am:...

[automerger skipped] Some properties are set as optional am: 7b933fb5 am: 4a6ee53f am: 9994fc81 -s ours

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

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

Change-Id: Ifa2798c054d45d3448859d4bfa0074a42e2ef8c4