Merge "Fix attestation error checks" am: 82f86a1d am: 18283b6c am: 286d2f7e

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



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