[automerger skipped] KeyMaster: restore device_unique_attestation am: 351da8db2e -s ours

am skip reason: Merged-In I3fafe44371e5b436e4c6e4c1454f2970fc6425ba with SHA-1 19a8ac1cd3 is already in history

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

Change-Id: Idcc5a8ee4a486e1e30e20b17ee4439003c1d5499