Merge "Fix attestation error checks" am: 82f86a1d4b am: 18283b6ca8

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

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