Merge changes from topic "CAS AIDL Integration" am: 9346b8b9 am: 195a80f9 am: dd9d4f0c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2418321



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