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

* commit 'ba5ed70d5549faa0a1b2038354421e9c4d1116dd':