Merge changes from topic "c2aidl" am: 94a68d04b7 am: 267986bd2d

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

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