Merge "Don\'t run QS tests on TVs/Watches" into nyc-dev
am: 66e58b2730

* commit '66e58b27303df00348f954bcd5262c92d158bd33':
  Don't run QS tests on TVs/Watches

Change-Id: Ie520441e67b29cc6f5758255b3e17c50b39d28be