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

Change-Id: If5ebeaa6792d0f648c847247c6e96e0d99c30b33