Merge "Workaround a bug in tradefed runner not supporting assumeTrue()" into nyc-support-25.2-dev