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

Change-Id: I84652c054cd721de00c98383f549a9a33feeb692