Merge "Move Trusty C++ KeyMint to v4" into main am: bc6efddf79

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3375712

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