[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

Change-Id: I0a8eba5e36d3fd4891c38ccdf325b0ac981d2734