[automerger skipped] Merge "Merge redfin/bramble support." am: 06f3443b -s ours am: 3190be64 -s ours am: 078d387a -s ours am: ea593e20 -s ours am: df7985bc -s ours

am skip reason: Change-Id I9e19972d433064adc527b014822449996dd09752 with SHA-1 95101632 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1466389

Change-Id: Ied97028c26e2f83444f5a54d5ab79eb44365c78d