Merge "Reinstate C++ KeyMint impl as default" into main am: 1e6a078326 am: cde647a820

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

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