Merge "[automerger skipped] Merge "Add minOccurs="0"" into android10-tests-dev...

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

am skip reason: Merged-In Ib93a40e646f9c65bd62d23396c12ea31f2d735d8 with SHA-1 33bca5b1 is already in history

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

Change-Id: I3571bd6d6f4093b302953ff9b4f3b3ca7086f308