Merge changes from topic "cherrypicker-L84900000961803500:N52200001385298444" into stage-aosp-udc-ts-dev

* changes:
  Fix attestation error checks
  Allow extra error code in device ID attestation