[automerger skipped] Merge "Merge redfin/bramble support." am: cdf176e1 -s...

[automerger skipped] Merge "Merge redfin/bramble support." am: cdf176e1 -s ours am: c4b5391a -s ours am: 17cc58d2 -s ours am: 2eb06985 -s ours

am skip reason: Change-Id Ib4f79f13505061c294b0f9b120765d866aad38cc with SHA-1 9d0e9cb9 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1465684

Change-Id: I991b52ac4302bd39e4d5c0e54f264754a913adf3