Merge "Update KeyMint VINTF fragment to version 2" am: 73e15472a4

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2002270

Change-Id: Ice830ca23216d33c72d61d13003ec7bcf752e969