Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev am: b68968f638

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646738

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