[automerger skipped] Merge "Merge redfin/bramble support." am: c49d81f25a -s ours am: 98e5e48a7a -s ours am: aba9cf1165 -s ours am: ea54f5bcb2 -s ours

am skip reason: Change-Id Idbb48a452d1da60129cf7f74233eac149079bc83 with SHA-1 21d8cf0eee is in history

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

Change-Id: I65e16b835121d6d4d13ffe99f8f96e0eaf0533d6