Merge "Update KeyMint VINTF fragment to version 2" am: 73e15472a4 am: 02b7992b62 am: 5cc1805e43

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

Change-Id: Ida4c2b5f87b26577d56b8b74ac45367dcb79dbed