[automerger skipped] Bluetooth: Modify and append to the Out-of-Band API am:...

[automerger skipped] Bluetooth: Modify and append to the Out-of-Band API am: 96e6e4a0 am: b4f9ff18 am: a4d053d2 -s ours am: e1985289 -s ours

am skip reason: skip tag Change-Id I46aec8c2cb64a8da8957d01d32b879d60df7a31c with SHA-1 6ab241ca is already in history

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

Change-Id: Ic794c98bba5c947ebd10868a5137b4a8560444b7