[automerger skipped] Merge "Add BluetoothShellCommand" am: ccf3bda9 am:...

[automerger skipped] Merge "Add BluetoothShellCommand" am: ccf3bda9 am: b58752d3 am: b63fe3e5 -s ours am: 692d7778 -s ours am: fce2122b -s ours

am skip reason: Merged-In I19f71fbf689d8551b20359f577fbffd999806273 with SHA-1 10a3e0ab is already in history

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

Change-Id: I41b1a8c54ca4e2c187fb2d59b7145c76514660f6