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

am skip reason: Merged-In I93b6cb939972c214dc67250dd62aa4fdd76273d6 with SHA-1 c525223b0a is already in history

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

Change-Id: I91052a8ee86b288b1fb0bb7d58e19358372e682b