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

Change-Id: Ia02dc57b765cb8887d701c8ead09b3d1fd428ac3