Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0b3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556758

Change-Id: I25e393b48f0598834196c970be4d29f20216af97