Merge "Modify the Out-of-Band data path" am: 36b82ff94e am: 11d7b80705

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

Change-Id: I616a2e555710073a17b2be52fbfa2911e9d11cda