[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: c8e1042251 -s ours am: 452ef6a925 -s ours am: 17810ea41b -s ours

am skip reason: Merged-In I2b4893d7ac80df60b38c8b01bd8998b66c55fd0a with SHA-1 94531cf50a is already in history

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

Change-Id: I390532af615943dd49529c9afd37990f7c2a73b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>