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

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

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