[automerger skipped] Merge "Merge redfin/bramble support." am: cdf176e17b -s ours am: c4b5391ace -s ours am: 17cc58d224 -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: If097b44b08c3f10b81648d2f8fcfdefa898fd0df