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

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

Change-Id: I998d0303876bbec21f659e4753758021bb5e056d