[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow extra error code in...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Allow extra error code in device ID attestation" into android13-tests-dev am: b68968f6 -s ours am: 5e896c98 -s ours am: 7b99c1b0 -s ours am: b8707d14 -s ours am: 34dc6df2 -s ours am: 87e5d615 -s ours

am skip reason: subject contains skip directive

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



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