Merge changes from topic "CAS AIDL Integration" am: 277701b5ec am: dee5b24c6f

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

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