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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ab39a37e86d1e9126d05da2d1bfa622424d5204