[automerger skipped] Merge changes I50045de0,I91b450f1 into main am: 8e0233feec am: 43fb25f235 -s ours am: 3c092c785e -s ours am: 37d70bb362 -s ours am: 5cf5061691 -s ours

am skip reason: Merged-In I50045de0816cf810a047fc0e6ba93225121c76f8 with SHA-1 a0fa8bfaf9 is already in history

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

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