Merge "Allow extra error code in device ID attestation" into main am: e4d590bc59

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

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