Merge changes from topic "ks2_aidl_autogen" am: c79a95510f

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

Change-Id: I5b8f42ad16476257feacaa105023e8192ac313f6