[automerger skipped] Allow caller to specify key CN in generate_attestation_from_EVP(). am: c6aaab44fe -s ours

am skip reason: Change-Id I93b6cb939972c214dc67250dd62aa4fdd76273d6 with SHA-1 c525223b0a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/13037014

Change-Id: Iadbe4e2b7eac56ae5b27b14fead2991a04b7519d