[automerger skipped] KeyMaster: restore device_unique_attestation am: 351da8db2e -s ours am: 79d7005497 -s ours am: 307f45c8f3 -s ours

am skip reason: Merged-In I3fafe44371e5b436e4c6e4c1454f2970fc6425ba with SHA-1 351da8db2e is already in history

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

Change-Id: Ic4e410088d614fbb758d6535fdd63be637689aae