Merge "Fix unique id attestation on devices with keymaster" am: 451c96f1e3 am: 5272ab0641 am: 38be482975

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

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