Merge "Allow extra error code in device ID attestation" am: 1d7447e5d3

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

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