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

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

Change-Id: I2eedb65bacef6075d5cf825749915262c25f4727