Remove clap 2.33.3 and replace it with 3.2.23. am: 6cdbbcc640 am: 8c11a6e7a4

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clap/+/2469622

Change-Id: Ia1c2398b336cfcb8abde1ff9605854b8416a2454
Signed-off-by: Automerger Merge Worker <[email protected]>