[automerger skipped] Merge "Uprev remote-shell to 6 and aura-shell to 63" into main am: 9131cd7dd3 am: 7e5ca9c7fd am: d26b2bdff5 -s ours

am skip reason: Merged-In I98677457ccfcec7bd3fbd3a837404c05eb7830d7 with SHA-1 d068064e66 is already in history

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

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