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

Change-Id: If0c75e74b1c67d9f286235dbfcd01a7362dcb71f