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

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

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