Merge changes from topic "cas_aidl" am: 9d7488c540

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

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