[automerger skipped] Merge "Modify the Out-of-Band data path" am: 48353932...

[automerger skipped] Merge "Modify the Out-of-Band data path" am: 48353932 am: cdc563b0 am: c0240911 -s ours

am skip reason: skip tag Change-Id Id593df4de85d12e114aa44c64c4fb01f7e7419c0 with SHA-1 98139d5b is already in history

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

Change-Id: I0deb33f1be75d09ff6d6a2ec67c1807cd73314d8