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

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

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

Change-Id: Ica9151a2b11d3172118fab9ac149b64f88d42dc6