[automerger skipped] Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 am: 6c38c03f19 -s ours

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

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

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