Merge "migrate to clap 3.x" am: 3d5d2668c5

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

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