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

[automerger skipped] Merge "Merge redfin/bramble support." am: 06f3443b -s ours am: 3190be64 -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: Id5f9274b43660b64bc0182c4e41ab8c2ac0d0557