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

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

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