[automerger skipped] Merge Android R am: 2164b8fcb4 -s ours am: 425e2b5abc -s ours

am skip reason: Change-Id I5f6aefff19c46967dc9e2f677828030dc137b7ce with SHA-1 375a5808e4 is in history

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

Change-Id: Id1b2b52caa78724d4e441f57fd14dead637699b3