Merge "Update KeyMint VINTF fragment to version 2"