[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 375a5808e4 -s ours am: 09e08c5ec0 -s ours am: d974ea248c -s ours

am skip reason: Change-Id Iaf32fd4a6c83aeb7f50755af16559afa7b60fefc with SHA-1 4648171443 is in history

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

Change-Id: Iee40f1b78b4b84675e5cdf2cd430299ec81a3b0c