[automerger skipped] Merge redfin/bramble support. am: c6530fa75b -s ours am: d149263995 -s ours am: aff914c5d5 -s ours am: 995ee91dba -s ours

am skip reason: Change-Id I075961a717a9a604877dfbece5251a45a2ca8481 with SHA-1 337739ae03 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/layoutlib/+/1466388

Change-Id: Ib5b20f1bc3853a547f923330a3bf1034b09945e1