Merge "Allow extra error code in device ID attestation" am: 1d7447e5 am: 013030d9

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



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