Merge "floss: btclient will now accept command line arguments" am: de115d9c...

Merge "floss: btclient will now accept command line arguments" am: de115d9c am: 2530581a am: fe63e477

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1799247

Change-Id: I4858c0f16db9d6321fa4e20bd5b774311cbbaf98