[automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 am: e4cc51fe87 -s ours am: d1cbfe8772 -s ours am: 234b4d2d27 -s ours am: ffa5b76445 -s ours

am skip reason: Merged-In I6ea5bd7ee19b3b172330117bfde1b16745debba7 with SHA-1 3f6ab601b9 is already in history

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

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