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

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

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