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

Change-Id: Iffebe6265ed51e96bd92f099beeb4c5a1fdd35ae