Add attestation key to generate/import messages. am: 6e20ea4592

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d6cc47abaa83ff1da20bab1883121bddd9fb20c