Merge "Use clap 3.x" am: d0ea505b am: 276a203e am: 3522735a am: 41818c83 am: 7ae446c3

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



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