[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours

am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history

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

Change-Id: Ie43af376ead977aad7942af421eea8c3bc28f53e