Merge "Add placeholder for types generated from AIDL" am: eb9bee159f am: 13ab0f6d99

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1387137

Change-Id: I5c4f91c161f75961f121f7e6739fbe754284bc35