tree 00a6ab14bf52bef85af5fb9d01b4e1aa79690411
parent bb215a647a94ba00cdc1eed711acfa96c23ac4e2
parent 3f39e3d6243023de6106da467e8679d3d825fbf6
author David Drysdale <drysdale@google.com> 1623770078 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623770078 +0000

Merge "KeyMaster: restore device_unique_attestation" am: 3f39e3d624

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1731411

Change-Id: Id1ce741b9235c4ddc8dbe05ce8d2e16fca933e11