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

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

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