Merge "Support test skipping when power save modes aren't enabled."