Merge "DO NOT MERGE: Disable two multi user tests for TV devices" into lollipop-mr1-cts-dev
am: fe0c8f2aaf  -s ours

* commit 'fe0c8f2aaf972cdc24a4bdca25e3d859b8f40d1f':
  DO NOT MERGE: Disable two multi user tests for TV devices