Merge "Fix attestation error checks" am: 82f86a1d4b am: 18283b6ca8 am: 286d2f7ea6 am: e13d20b746 am: 702909f11a am: e0f796e184

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

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