[automerger skipped] Merge QQ3A.200605.002 into master am: 6a3453e2cc -s ours

am skip reason: Change-Id I03dd193ab81ad3c6892619e079dbedc392755235 with SHA-1 3567bc34b2 is in history

Original change: https://android-review.googlesource.com/c/platform/external/wayland-protocols/+/1323220

Change-Id: Iee08b5ffd56986aa1d1b3399358a40b7127facb9