[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 am: 4a8f0746 am: 926f35ab am: 4c88f2a6 -s ours am: 28c85ac3 -s ours

am skip reason: subject contains skip directive

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



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