Merge "Fix unique id attestation on devices with keymaster" am: 451c96f1e3

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2064510

Change-Id: I32af3807af12f5dab1201a89390e5fb102762a5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>