Merge "ConnectivityConstraintTest: Fix wifi state check in tearDown()" into marshmallow-cts-dev