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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic22ebb06ad4aefbbb3c29c7c590d5c6bd476adb8