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

Change-Id: I15537d95bc28ff14aa3942d932378e99d5793f42