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

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

Change-Id: Iad74f94a9cd82ff92651cf996ab75d84bfb11d5a