Merge "Update the KeyMint version to 3" am: 633b9ba26b am: 6c29c112d3

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

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