am 85ac1535: am ba5ed70d: am ba893966: (-s ours) Disable screen pinning test on watches and tvs. DO NOT MERGE

* commit '85ac1535718f3dffd80475c7ba6562f37904e3e3':