Merge changes from topic "c2aidl" am: 94a68d04b7

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

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