Merge "Shift to KmVersion::KEYMINT_2" am: 43a6e4900d am: b594cddbd9 am: 7ab3ed6e23

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1910069

Change-Id: I61c5ee888abe6b3809f43588a2c442400140429f