Merge "Require keymaster4 attestations to contain the right version." into pi-dev
am: 4046722d02

Change-Id: I5a3005f265e3067e65b5bed671b14383906b4368