Snap for 8515382 from b371a0e5b9e88c319522a6fa74e036e8fb983a0c to tm-release am: 46b3909a77

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

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