Merge "Add flag for app-generated attest keys." am: cc9d967deb am: 69bd0bd99d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1591655

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c66443d86c2a1b24757e9121f6824d722747f70