Merge "Allow extra error code in device ID attestation" am: 1d7447e5d3 am: 013030d9a4 am: 36a30021e6 am: 5f7d0654be am: 0e7e98d52a am: ac47d937d9

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

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