Merge changes from topic "cas_aidl" am: 9d7488c540 am: bf30bc6187

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

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