[automerger skipped] Merge "Merge redfin/bramble support." am: 4b4cddda -s ours am: c4cddced -s ours

am skip reason: Change-Id I32df229c5561a1cae7be722865c378145de5a23a with SHA-1 f32214cb is in history

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1466508

Change-Id: I01ada60b561e6cdb41babda29812154104a3e58f