Merge "Report Trusty KeyMint as KmVersion::KEYMINT_2" am: f7eed000de

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1910047

Change-Id: I451ef8b033388f7b817b56464bd6dec5e0798640