[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 375a5808e4 -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: I749aa636bc2280e18246b976edc782d913af7d6c