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