[automerger skipped] Merge "Add minOccurs="0"" into android10-tests-dev am: 9f797b8f2a -s ours

am skip reason: Change-Id Ib93a40e646f9c65bd62d23396c12ea31f2d735d8 with SHA-1 33bca5b12b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1202365

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3c7cfc20b5096bf88ec81635570de1b8a10cab6