Merge cherrypicks of [16381824] into sc-qpr1-release. am: cc7fe45652

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

Change-Id: I131c9f5b7a3b0c0d296ecb004fbae6b17ae93c57