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

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

Change-Id: I5380ba6c69ce9b98fa74f83fd380118793b1b390