[automerger skipped] Merge "Merge redfin/bramble support." am: 52e9473f1e -s ours am: 11e52152dd -s ours

am skip reason: Change-Id Icce4e4f44a811726f76a8602a44e9060cc1dbaa1 with SHA-1 3109cbe663 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1465935

Change-Id: I281dc4a0826e6e99fed072a8ec3e86e2a2db32ba