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

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

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