Move C++ KeyMint to v4 am: 408cc22891 am: 1a373cd8c1

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/3375750

Change-Id: If020932379a7becd61d16cf58cc598775fffd72a
Signed-off-by: Automerger Merge Worker <[email protected]>