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

Merge "Add support for app-generated attestation keys." am: 50a66e39 am: 2da3a280 am: bbdb4d9e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e4b2bcfa54953e37452a7533a89b49586596502