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

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

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