Merge "CAS: Add AIDL Support" am: 27530abad7 am: eec8b98fdb

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

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