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

Change-Id: I2556f70510c08783e0635377f1702db617c5703d