[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 420e871223 -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/+/20136705

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