Merge "Update keymint latest aidl for cpp version code" am: a8ceb15747 am: f531ea6fe8 am: dfc9ac1ba2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2317170

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