Merge "Modify EC/RSA key factories to generate attestations." am: 939fbbc8ef

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6e949ac04155a927e7985bdd5547994b85ed518