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

Change-Id: I07651d65ccafb5b6df00cf8379d1d966570dc5ef