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

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