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

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

Change-Id: Ie63366c470ae89279587c19e6c0068ca3ebaa20c