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

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

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