Prepare for clap 4. am: 1f46065b2a

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/2323536

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