Merge changes from topic "fix-aidl-warnings" am: a886a5c4be am: 5235704ac4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1688165

Change-Id: Iac71017b6bee1b1b41c15054ac7801470c28f08a