Merge changes from topic "c2aidl" am: ddfaa610f5 am: 5e7eb1606b

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

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