Merge changes from topic "cas-aidl-frameworks" am: b8e8ab3775 am: 872de78dee am: b9b6a35496

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

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