[automerger skipped] Merge "Merge redfin/bramble support." am: cdf176e17b -s ours am: c4b5391ace -s ours

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

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

Change-Id: Ifca0f7ef0c8eb85468f30c4f40ed8688ce749160