Merge "Use clap 3.x" am: d0ea505b am: 276a203e am: 3522735a

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



Change-Id: I2a6514238e51c2032c366e0ab52c6f7a154949ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>