Merge "KeyMaster: restore device_unique_attestation" am: 3f39e3d624

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

Change-Id: Id1ce741b9235c4ddc8dbe05ce8d2e16fca933e11