Merge "Temporarily use libclap_deprecated" am: 1dcf47b1 am: 63ffb901 am:...

Merge "Temporarily use libclap_deprecated" am: 1dcf47b1 am: 63ffb901 am: 72ad9de9 am: c5eb47ce

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



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