Merge "Re-order skip checks for attestation tests"

    //     allowing it to be launched with Android S (or later) with Keymaster 4.0

    //     in StrongBox

    void check_skip_test(void) const {

        if (is_attest_key_feature_disabled() && is_strongbox_enabled() &&

            is_chipset_allowed_km4_strongbox()) {

        // Check the chipset first as that doesn't require a round-trip to Package Manager.

        if (is_chipset_allowed_km4_strongbox() && is_strongbox_enabled() &&

            is_attest_key_feature_disabled()) {

            GTEST_SKIP() << "Test is not applicable";

        }

    }