[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: 66ba80c5 -s ours

am skip reason: subject contains skip directive

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



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