[automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev am: 516718071b  -s ours am: 2b0ce83a04  -s ours am: e98a380651  -s ours
am: 6b2ac626e9  -s ours

Change-Id: I3d003c5e636d4078153fd8f6253200c4d22c6f67