[automerger skipped] Merge "pdl: Update code for compatibility with Clap...

[automerger skipped] Merge "pdl: Update code for compatibility with Clap 2.3.3" into tm-mainline-prod am: cc351328 -s ours

am skip reason: Merged-In Ib242d348a845f05a56edf45101e1b5d6ed291893 with SHA-1 45151b4a is already in history

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



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