Merge cherrypicks of [12960599, 12959910, 12960718, 12960387] into rvc-qpr1-release am: 81bcd7628b

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

Change-Id: I921555ec32a67b148b87b493c075bf319809e1f2