Merge "Re-order skip checks for attestation tests" am: 475bb11af0 am: 7bd7dac78e

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

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