Merge "Add support for app-generated attestation keys." am: 50a66e39cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If460b938bbc4c10bad414abcf9965db5216eb423