tree 587b16409194bd0738b7ef55f681538ce6e8d7a7
parent da671049875c4a195cc1e922ec93c8cf2ecaa4fe
parent 69bd0bd99d883108971ac3ac3c1ea13c2b3e57f5
author Shawn Willden <swillden@google.com> 1613592894 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613592894 +0000

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