Merge changes from topic "c2aidl" am: ddfaa610f5

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

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