Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2"