Merge cherrypicks of [17395476] into rvc-platform-release. am: 19d7f9d2fe

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

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