Merge "Fix attestation error checks" am: 82f86a1d4b

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

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