[automerger skipped] Add keymaster attestation generation with EVP keys. Add identity credential tags. am: 1307e319c5 -s ours am: 6cc84b0500 -s ours
am skip reason: Change-Id If5f01c47441facb3f019c6267ccb7ac2ab39152f with SHA-1 8367d5351c is in history

Change-Id: If4d1358eeb6c82841982562b78538a0620f8d41b